merge
authorStefano Stabellini <sstabellini@xensource.com>
Wed, 11 Aug 2010 14:56:01 +0000 (15:56 +0100)
committerStefano Stabellini <sstabellini@xensource.com>
Wed, 11 Aug 2010 14:56:01 +0000 (15:56 +0100)

Trivial merge